tried fixing core tests