Fixed MapTests, all tests now green
Set up getInstanceTest variant for tests