t2: rewriting tests