Macau -> Shanghai -> Hong Kong

Hi,
I'm an Australian passport holder travelling to Hong Kong for a conference.
During my trip I would like to travel from Hong Kong to Macau -> stay one night -> Macau to Shanghai -> stay two nights -> Shanghai back to Hong Kong -> Hong Kong back to Australia.
My understanding is that this qualifies for the TWOV period? Could you please confirm?
Thanks,
Amy