improvement and test fix
revert pom changes