#31: tests updated.