Tests for tier 2
Complete tests for tier 2
Add tests and rates for third tier