I agree with you on the detox drinks but just wanted to ask and make sure.

I still have about 6 more days til the test so that should help on top of the dilution. I also might consider substitution if I can get some clean urine since I will be in a closed off bathroom for the test if I recall from the last time I took it.