core: Fix some tests, revert a change