Allow fixture files to be specified as a folder name, individual file na...

Apologies, no new tests (previous tests pass though)