Fix unit tests and UISClienthandler