phab/src/infrastructure/export

feature/better-testing