Changes to tests for CI