fixing acceptance tests that I have broken
beginning modification of constraint class
got an end to end test script working w/ new constraint system