In the re-test you will only have to do those two items.
From what I remember of my flight test the examiner told me that if I failed at any point he would tell me, the test would be over, and we would return to base. Then on the re-test it would start from the point of failure from the last test.
So it's not all that bad