Update primaryKeyField exceptions
Update tests
Merge branch 'u/remove-primarykey-exceptions' into iOS7