tweak to core tests