Moved around some test files