refactor poms and tests, mocks
refactor metadata tests
take out a test for now
Merge branch 'ivan' into mark