Cross-country heterogeneity and the trade-income relationship