Fix tests broken by recent changes (Bug #1324748)

Change-Id: I44bb7b53dda86fd25b799c90645c6bfadf05ce2b
Signed-off-by: Nathan Lewis <nathan.lewis@totaralms.com>
Merge "Fix tests broken by recent changes (Bug #1324748)"