Merge in chrisdickinson's test data
Minor test file formatting fixes