This adds a framework for multiple tests to run during an
upgrade. This also moves the existing services test to that framework.