STUDIO-2572
Fix refresh ui + existing tests