Improve UI tests

see #225