Test addition and fix some JavaDoc