Add None workaround back in for tests
Add None workaround back in for tests

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