Re #934. More tests. Special cases.