Add additional tests to validate upgrade actions behave as expected