Ticket130911b unit tests2