Factor the metadata into test filenames

Closes #221
Closes #226