Cleaned up tests
Added javadoc documentation