Fix Travis unit tests

Change-Id: I000e5ff649b4e3e3564e53cc962495e7544cd5d9