Fix wrong test
Add default scopes for classes