Corrected tests to pass on travis

Change-Id: I3670400fccd9453005b92345c7664bfc272687a6