fix up all tests;