Added tests. bugid:111569