removed some unnecessary things, tidied paths, allowed for reading in from slightly different testing criterion
removed some unnecessary things, tidied paths, allowed for reading in from slightly different testing criterion

corcra/bf2,corcra/bf2