Add country building tests