Correcting logs in test helpers
Rewriting tests