Fix usage of id in test
Fix matcher