rewrite test suite