No i wouldnt increase your calories just because youre going on TEST. TEST helps to gain muscle mass but it wont magically keep you from gaining bodyfat. and carbs and fats dont build muscle, protein does. although the other macros play a role in anabolism they dont directly make muscle growth. so theoretically if you play your cards right you can build some lean mass while maintaining or slightly reducing your bodyfat levels. but that depends on how you structure your diet and what you eat. also how you workout.
now when youre doing a 400 caloric surplus do you normally gain alot of fat?
i wouldnt overthink this. if you know what works already for you, then stick to the formula. i would just make sure you are eating good wholesome calories. not junk. since you want to stay lean. i would also recommend doing some steady state cardio like incline walking if you are afraid of gaining Fat.