ticket1: tests updated