Adding NoMatch handling and tests