ticket:2 Updated tests