removing old testutil
fixing remaining imports
merging orgin/master