It was Tom that I used to work with. or it was with Tom that I used to work.

i went there with my friend.
강조할때

it was with my friend that i went there. it was my friend that i went there with. 둘중에 어떤 것이 맞는 표현인지
혹 둘다 맞는 표현인지? 햇갈립니다.

그리고 i used to work with tom. 의 경우도
it was tom that i used to work with. 인지 혹은 it was with tom that iused to work.인지?
제느낌으론 it was tom that i used to work with.이 맞는 문장인데 딱히 이렇다할 근거를 댈수가 없네요.

여러 선생님들의 도움 부탁드립니다.