Adding view and fixing tests.