Fix broken extended tests

[merge]