Somehow these changes have leaked into upstream/develop
Fixing tests