Moved some test files around
Working out tests