crud: rewrite tests