Fix another test for f02314f66ed

(This is one of the tests that only runs with 'meteor self-test --slow
constraint-solver'.)
Skip ResolverState clone on duplicate constraint
Improve error message on one particular conflict
refactor tests
fix another message
test another message
Change a "shouldn't happen" into a thrown Error