Cleaned up UI test