Rewrite some tests