Fix core tests