Add strict matcher class and test