get rid of extra params
test refactor
more consistent indexing
fix pom
all tests pass