Refined view/Base and added tests