UI tests and bugfixes