Rename test data and test vars

Shorter, simpler names since I ended up just using a single test dataset with minor variations.