tests moved, javadoc added