Added core tests