Add core tests, update matcher