[ticket/11700] Fix tests after merging new develop code

PHPBB3-11700