Does drinking alot of fluids help to rid your system of THC from Marijuanna use?

Me and my friend are getting drug tested, we used to smoke everyday but we got clean and passed our tests after about a month of not smoking after we passed we each smoked about two times but we are getting tested again in 2 -4 days and last time we smoked was friday night about 3 days ago. tonight alone we've dranken a shitt ton of water and gatorade and coffee and pissed about 6 or 7 times each. does drinking alot and peeing alot help rid your system of the THC? we are getting tested by a shitty CVS drug test that only tests for marijuanna in your piss and can only be used once. tommorow we are gonna go to a sauna and try to sweat it off as well, will that help too? any suggestions on how to get it out of our systems except for using a detox cause thats out of the question will be appreciated. and please no answers saying you shouldn't smoke in the first place cause i dont wanna hear it. please and thank you :)