Start rewriting tests