Fixing origin extended tests