Add CI test
Some fix locators