Fixed tests to take deferred validation signature change into account