PDE-427 Trying to fix the extended tests again