fixes #1382
#1952: Update tests