Cleanup in test, preparing for move of alto/structure-checks to MFpakStructureChecks