Got a couple of more test cases working for real.