Ya I would deffinately say its a calorie/cardio problem. The test increases your metabolism so much that the water retention shouldnt make that big of a difference cus you'll be burning fat so fast. Just lower your calories and it should help.