Improve test coverage

[jsakaluk]

Given loss of tests to new scripter style of constraint specification, need to build critical mass of new tests

[jsakaluk]

• [ ] 40%
• [ ] 50%
• [ ] 60%
• [ ] 70%