First step to rewrite tests...