Same. I bloat far too much from high test.
For my next cycle, I'm planning 250 mg test, 4-500 mg NPP and now thinking of throwing in ~400-600 mg Mast E. Ive been reading people's experiences with higher dosed Mast even while lean bulking, and they fell in love with it.