Clean up tests a bit
Clean up tests a bit

erinspace/scrapi,erinspace/scrapi,jeffreyliu3230/scrapi,mehanig/scrapi,CenterForOpenScience/scrapi,fabianvf/scrapi,CenterForOpenScience/scrapi,fabianvf/scrapi,felliott/scrapi,felliott/scrapi,ostwald/scrapi,mehanig/scrapi,icereval/scrapi,alexgarciac/scrapi