Fix 6 UI test failures
Merge pull request #44 from ndlib/fix-ui-tests

Fix 6 UI test failures