Amend tests so that they pass on our new Ubuntu 14.04 Jenkins slaves.