cleanup of test harness and functional test prep