Added more tests for CI