more optional an required and clean up references
add option to make RP14 test scraper fake today