Matchers refactored, Tests updated