High-level Constraint Support For Combinatorial Testing