Refactor test view classes for reuse

Change-Id: I0923c1a0d32e4d253d7024319c7c0d2960fd1578