[ticket/10772] Updating tests

PHPBB3-10772
Merge branch 'ticket/10772' into ticket/develop/10772