Fix tests and OpenFisca adapter