Comment 2 for bug 1234224

Thanks Rhod! The short tests are currently running from the intel-testfix branch, to enable quicker turnaround on bigger changes to fix things before a single merge into the trunk, hence not picking up your commit. I've merged it into the branch now.