test/data rearrangement

The `test/data` directory is really messy. Let's clean it up a little bit.