Try to fix unit tests for Travis

Change-Id: I7d6407937d433af6b05d6c156bbbf91292767ce6