Updated test cases with Tier scenarios.