refactoring
One test 2.2 added