initial tests rewrite