Simple fix for TestHStoreCoordinator and other failing tests