fix tests, fixes #1173