Rewrite tests once more