SWC-670: fix ui and tests