Added another matcher and tests to allow refactor