Updated tests to check for the new constraint format
Implement new format for width and height constraints