Bug 22008: Add tests for new constraints