#1031: tests updated.