Rewrite bad tests