Move test data files into test/data directories for consistency

Small cleanup, for consistency with the other tests.

@stephensanchez