progress on the constraint search and added tests