Started with rewriting tests