Cleared up unit test files