capture helper change & fix tests case