Fixed failed UI tests
Merge pull request #1209 from sghai/fix-test

Fixed failed UI tests
Clean up comments and docstrings

None of the changes in this commit have a functional impact.