added 3 tests (2.2.1 section) and little fixes