fix country code spec (thanks Alejandro Mostovoi)
fix harvesting tests
fix refs