rewrite tests to be more standard