rewrite some tests