Reorganised test files and test files. Fixed some bugs too.
Merge branch 'master' of github.com:stumoodie/CombineArchive