Moved mink matchers in separate namespaced, added more