Bug#1 fix.
And some more tests :D