Fixing failing CI tests.

WIP