Moving test to test directory for cleanliness