refactor poms and tests, mocks
refactor metadata tests
Merge branch 'ivan' into mark
fluent interface