Fixed #357 CreateConstraintExpression now takes schema into account + ad...

...ded missing tests