Simplify Evol/Agg Companies/Countries/Domains functions, client and tests