added  some javadoc
refactored test to reflect all single tests that where included in one big commit