Make this compile with "master" again.
Fix stupid first test case.

Now, there really should be a lot more test cases!