Add item-click event linker; update test cases