Handle click on tests
Move helper methods into extension class