Fix test, upgrade joda?