converted to maven nature
fixes
fixes
add JUnit tests