Fixing tests in CI