Fix part of failing tests