Fixed failed tests. bugid:112587