Merge pull request #68 from petevg/bug/fix-integration-tests-xenial