Update test suite for new views