Started rewriting tests