tests fixed and extended
removed unused imports