Cleaned up specs and added new feature tests for tiers and shippings.