ticket:#4 Updated tests