more fixing of failing tests