Move Test Fixtures back to src/test/java folder