Fixed failing core tests.