Merge "Add a few UI tests"