Add UI tests + fixes accordingly