various improvements to UI tests in attempt to improve reliability