#1577 - Fix for some WOT tests failing