Fix tests + light modif ast