added first tests from section 2.1
changed package structure and added final 2.1 tests
cleanup