re-added Ui test, started fixing
Remove daed code