Organise test files
Merge branch 'develop' into feature/siafutest