Constraint exists work fixups

Fix project changes and added tests to cover the new behaviour added