ticket:4 tests added
Merge