Merge pull request #607 from HelenCampbell/XenialTestFix