Moved a test from MultipleAstromDataModelTest over to the integration
tests because it relies on having actual persistence objects not mocks.
Also did a minor fix-up for some tests that failed after recent changes.
Minor refactoring.