Gah, sorry. :( I could get to this over the weekend, if that helps. The test I added is probably wrong too.