2010-11-24 surprisingly didn't catch these problems until now
           (last 2 were caught properly before, but didn't have tests
           for them)
