Restore full version of this test ready for merge with trunk Keep the branch version for the re-branch