Simplify tests to sync with core