Update mocks for the new namespace. Closes #3445.
Merge remote-tracking branch 'ivan/bug/3445_fix-failing-tests' into develop