Updated more of the core tests