ticket:6 Unit test wo solution
ticket:6 Solution (test passed)
ticket:6 Merging to master