Clean up matcher tests