Added more core tests