Fix errors because of test scrutinizer