Moved tested code to src/main/java