Revert core-tests, synced with forge changes