[RFC] Fixtests

fixed tests

reorder and added incomplete use statements