removing old testutil
fixing remaining imports