Added base view
Added container element to container view
Refactored tests