Fixed core tests