Patch failing tests