Fix extended tests