Issue #197: tweak tests