Fixing up tests and different annotation scopes.