Further cleanup

Removed unused imports, added further tests