move core tests to match