Update tests

I think we're soon going to need a new way to make sure the tests still
work. Comparing against expected.txt won't remain viable if the output
isn't determinate.  Right now it's still working though.

An easy option is to sort the output by Filename and line. Another would
be to provide some "unit test" like way to validate the results on the
test files (I have no idea what that would look like).