Fix failing test, also fix javadoc return tag.