Updating tests to use new core files