Adding Scrapping Functionality and new Tests