Tidied up test data filestructure
Doc updates