Refactor IckleSupportManager; update test cases