reorganize test related files and removed unuse code
Merge pull request #734 from dannycoates/cleanup

reorganize test related files and removed unuse code