Fixed javadoc
Fixed current calls
Add some test cases