[ticket/develop/11568] Fix some more tests in 3.1

PHPBB3-11568