Fixes to UI tests
Merge pull request #999 from code-dot-org/uiTests

Fixes to UI tests