Changed some tests. bugid:110323