Small changes to tiers support and related test cases.