More cleanup and UserScraper test plus fixes.