Change: Fixing tests, preparing for CI.