More tests

Not as convincing as I'd like. But convincing enough to my eyes: I have used
this class without problems for ages.