cleanup pom.xml and make tests pass on mac os x