Add better handling of test data with Machinist