Fix Core tests.