refactor poms and tests, mocks