Cleaned up test code
Stubbed SortController and test