Re: Fixing the last failing tests