Fixing unit test issues introduced with view classes