Fixing tests from the previous commit
Fixing tests from the previous commit

Looks like I missed a case where there was a custom primary key but not
a custom remote key. If there wasn't a remote key, I was falling back to
@"id" when it should have been that only if we were using the default
primary key.

nbarnold01/Sync,hyperoslo/Sync,hyperoslo/Sync