Cleanup mspec/ospec runner to use a single array of files