Fixed share upgrade cleanup tests to use the correct ids