Cleanup the tests so we can cross reference them with the documentation. Update the tests to allow multiple annotations and defaults.