A few extra unittests bring coverage to 98% :-)