Tests are working now. next ... make pom's nicer