sync with EV fork: core tests work