Cleaning up core.test