Cleared up tests
Sorting out tests