Yes there can be some water retenion from a test cycle, just be sure to check and monitor your blood pressure as that may be the reason you had the spike in wster retention. If you are getting massive swelling where your socks cut into your legs and your can't wear rings then there is a massive issue.
Firstly your diet needs to be in check, too many carbs can be the culprit, also starting a cycle at too high a level of body fst will drive estrogen conversion up quite substantially, so there is that too.
Just going on the issue of having loads of viseral fat that it is a concern then what you can do is run a low dose test cycle like trt level dosing to elevate testosteone levels, so that would be 140mg a week. May sound really small but if your natural test is low that can be a great addition. And then anavar at 30mg-40mg daily, that will put you in the range of 340mg to 420mg which is a decent low dose cycle. I am currently 96.5kgs on 200mg equi and 250mg cyp, so that is just to show you don't need massive doses.
There has been a protocol out there that i havent yet tried with clients, but it would be 75mg test cyp, 35mg npp, and 35mg masteron ENANTHATE 2x a week. That would be enough to keep shbg down, estrogen relatively low, very minimal side effects and could be run for long periods of time if your bp is in check. 150mg test, 70mg npp, and 70mg Masteron a week puts you at the 300mg a week level which may be a good spot for you.