Started rewriting core tests