added country/supply checks and tweaked related tests