CONN-995 validationsuite modifications