initial rewrite of tests