Re-enable two tests that were failing only on travis.

Change-Id: I20dd87ec7d89985f26d3437b662efd7354231664