ticket:#6 Updated tests