Draft support for ListViews
Replaced some assertThat with verifyThat in test code.