rewrite of tests in progress