Move test data files into test/data directories for consistency
Merge pull request #321 from edx/will/move-test-data

Move test data files into test/data directories for consistency