OK, I'll add a few more tests tonight.