Javadocs and tests