Fix UI hooks (with respect to tests)