Fixed unit tests failing with new NonPrimaryAutoIncrement tests