Fix tests. bugid:112310