ticket:3 tests fixes
merge t2