Added new constraints and test for them