Fix JavaDoc warnings/errors
Fixed tests failing due to irrelevant array/list ordering.