Refactoring views
Added vcr and tests