Updated javadocs and tests