Set default scopes and fix tests