Added some waits to UI test