rewrite all tests