Travis: Initiating build for commit 'f509b68332649dbb559eac0d61127bea691b4e52' on branch 'master': Merge pull request #5934 from mnapoli/test-fixes

Unit test fixes