um... For one, drinking gallons of water is pointless. Start drinking water the day before the test, the rest is just keepin ya healthy mate'.
And green tea? lol.
If you smoke like a normal stoner or beyond, once or 6 times a week, then waiting a week is NOT going to clear up your drug test. Sorry to tell you this. If you're really desperate, excersize like crazy, sweat a lot, or pretend to injure your ankle or something two days before the test.
Just tryin' to help you out. :thumbsup: