Fix tests

[epoz]

Sheesh dude, this is 10 year old code and all, but fix the tests already... ;-)