standardize test files
Merge pull request #805 from maraoz/organize/test/files

standardize test files