MX-1223, add some better tests for rollback of updates that involve primary key changes