WIP - adding extra tests to persist import rows etc.