cleaned Testing; updated JavaDoc