Fixed failing tests for CI