Refactored constraintchecker specs