Merge pull request #158 from mureinik/imports

Code cleanup: Remove unused imports

This removes from test classes imports that are in the same package.