Fix broken CI tests