Ticket130910 unit tests