fix tests, remove unused imports.
Merge pull request #4 from stefanpenner/master

fix tests, remove unused imports.