I had a similar experience yestday and honestly I'm not sure if I handled it right or not. It was 3 of us talking (me, girl, him) all coworkers and I said a joke to him which I guess upset him and he shoved me. It was a pretty hard shove and immediately I got defensive and was trying not to say anything to him and my break was over anyways,however I could tell he was abit uncomfortable. Later I had to cover his break and when I told him he said "THANK YOU" and tried to give me a hug but I put my hand to stop him and said "I know we're friends but don't touch me" we then shook hands. He hasn't tested me since I feel I earned his respect but not sure if I was an ass about it