I think this fixes a test
added tests for issue #9
Merge remote-tracking branch 'upstream/master' into pk_field_override_fix