Ensure unit tests pass even if old testdata exists

Currently, changes to the the service and service type files aren't
picked up by the accounts framework properly.  When adding new
services or service types for testing, the old data still exists,
and so we must ensure that the unit tests are robust enough to handle
that case.