Add listener for stashboard sup.
Fix test cases.