Switched back to instance save methods on ContextManager

Also removing CoreDataTestHelper and it's horrible swizzled methods.