Updated tests & JavaDoc