Need a new workout!

I have been doing a circuit training style workout to get my body fat percentage down. I've gotten close to my goal. Now I'm looking to add mass, assuming I would add mass and then cut. I would like help structuring my workout to gain mass. I'm in the middle of my cycle of
500mg of Test E a week. Starting to see my body change but I'm wanting more mass. I have my diet down. Just need the best way to make the most gain I can! I can work out twice a day 7 days a week...(the Test is hitting hard)! Thanks for the help guys!