This patch fixes failing tests resulting from oversight in the previous attachments I supplied to this bug number. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>