Continuing to rewrite tests