Added test case for Tier. Small changes to the test suite.