updated tests, added model validation
added regex matcher validation, fixed failing test