Updated with some more assertions
A change to the click trackin gmodule