Started to refactor tests
Merge branch 'export_run' of https://github.com/jongillies/storehouse into export_run