Fix tests partly.