Upgrades.  Add service tests.