Fixed some tests. bugid:110323