Fix tests resulting from upgrading to Tire 0.5.4.