The change in bcf6604 added a debug info flag, which caused some tests to fail; I removed some commas so that the test matching still works.