Some updates to core tests