added / improved tests
javadocs