fixed UI test failures - updated review comments