[RFR] Fix tests, broken since view refactoring

Refs #124