removing old testutil
fixing remaining imports
merge orgin/master