Fix example data in tests
Fix matcher tests