Testing and JavaDoc update