Fixed PrimaryKeyTests