Add tests with constraints