Maybe fix the failing tests