Im doing a similar cycle to yourself, but imo you should take 500mg test, and i personally favour a slightly higher dosge of dbol, however 30mg will lessern the effects of water retention.