Fixing CI tests