Small change to constraints and toString
Friendlier test data
Small changes in constraints
Better test data