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
die correctly if test-packages fails
handle last error case
Merge branch 'cs-errors' into devel