Add a few more constraints to model to enable testing of constraints
Add some tests for cycle constraints
Remove default configurations
Merge remote-tracking branch 'origin/master'