TST: refactor tests a bit
TST: refactor tests a bit

danielballan/filestore,ericdill/fileStore,stuwilkins/filestore,ericdill/databroker,danielballan/filestore,ericdill/databroker,stuwilkins/filestore,ericdill/fileStore,NSLS-II/filestore,tacaswell/filestore