Added more tests for sortable behavior with scopes. Fixed cs and moved the tests to the correct class.