Upgrade tests to cope with changes to QA