Guy

I've update the latest test code. Can you merge with the main branch? Nan