Rewritting tests (part 1/2)