Fixes for core tests