Ticket_6: fixed test
Merge branch 'Ticket_6'