bug(controllerApp): fix click handler test
feat(unpatch): update unpatching for case of patching individual elements