ticket:7 Updated tests