Fix CI tests