More small coretest fixes