Code - Added more scraping logic. Added tests for some scraping