More core testing + fixes