Fix & test for required edit contraints, thanks @asolove