Get core tests to pass.