[core] Fix unit tests, forgotten in merging