3rd mate too 2nd Mate/1600 ton master w/3000 Itc

I am a 3rd mate sailing on limited vessels, I have 180 days as an AB while holding my 3rd mates ticket,
My Mate time is on limited tonnage vessels, will I have to test again to upgrade to 2nd mate 1600/3000 ITC?
Also my sea service letter only stipulates horsepower? Thanks

There is no such thing as a 2m 1600/3000.

You can upgrade to 2m any gross tons with a tonnage limitation based on the tonnage of the vessels you have worked on.

You will not have to test for the mate but you will have to test for the 1600 ton master cross over.

If your sea service meter does not list gross tonnage make the office rewrite it.