Refactor view and add another UI test
Add more UI tests
Refactor test helper