Tests obsoleted by #550