Further fixes to tests for 14.04.