More JavaDoc and some test changes