re: Fixing the last failing tests