Added jdocs
Improving tests