Get rid of core.test