Fix tests that failed after removal of ListView