Moved tests under src/test/java