Temp commit, make ParseAndMarshallModelsTestCase compile, although it will fail