Mihir | Fixing tests on CI, even though they fail here