rewrite some tests
rewrite some tests