Fixing extended tests