Update for testing fix on travis and macrso