Issue Description:

Clean up file store on every test method (setup or teardown)

Acceptance Criteria:

Make sure that each test is not affected by other test outcome/leftover