Add tests for views
Refine image scrapping logic