Fix Skill selection (was setting a default scope, overriding any further sorting)
Remove default_scope from all Models
Additional scheduling tests