ticket:1 Added tests