Testing the new upgrade structure