More clean up and moved tests to maven test dir.