Changes the test rule and minor changes to the match and search managers