Improved javadoc comments
Cleaned up imports and removed broken test