Refactored test matcher test