OGM-45 Using OgmTestCase in SimpleQueriesTest to reduce number of different approaches of SF set up