Oops, fixed tests. bugid:111569