Convert fixtures to use file-fixture