added mocha classcode, cost_category, country test