Added tests and refactoring kexp_scraper