Added tests. bugid:111506