Redox

I know that it will be impossible to answer some or all of these questions but there seems to be some very knowledgeable people here. Unfortunately, I was recently arrested and a stipulation for the continued legal proceedings includes a UA coming up here on Monday, Feb the 9th at 2pm. I had been a daily smoker up until the 13th of January and since that date I have not smoked so much as a hit of MJ. I have been using many of the suggested methods for detoxing, but nothing too crazy (basically just lots of water, niacin and other vitamins and cranberry juice). Also I worked in a construction field so I consume lots of water daily and also usually sweat throughout the day. I had a friend who is just about my size (5'11 155lbs) and smokes as much if not more than me and he who was clean on this method after around 17 days. I am writing this because much to my dismay I tried my first home test today (day 22) and it showed positive on my 2nd void of the day. The urine was very dark as I had not been hydrating very well for the past week thinking i'd surely be fine. Though I did not attempt to dilute todays test in any form, I wanted it to be the most accurate but honestly did not expect a positive. I still have 6 more days to go but this obviously has me concerned. Would the best way to address this problem to really jack up the water and vitamin use for this week? What else might I be able to go..I could substitute, I have before but I have been not using for so long already I would much, much rather just do it naturally. Is it possible the test was wrong? I'll do another but at 18 bucks a pop id like to keep them to a minimum. Help me out please!