Add more core tests / Rename test