Adapted test to changed validator error message
Merge remote-tracking branch 'origin/develop' into develop