Work on base views and tests