ticket:#3 Updated tests