I was in your situation several times. I'm not sure of your budget but a guy at the GNC store sold me some stuff that was in a locked cabinet(assuming all GNC stores have locked cabinets). I was charged $90+bucks for it and it worked like a dream and all you had to do was injest it at least two(-four)hours before your scheduled test and you were clean for good until your next smoke session. It even had some natural agent in it to make sure your urine retained it's yellow color. I just can't remember the name, damnit. Maybe someone with a better memory can provide you the name. But GNC definitely has it, and why should'nt they with all the bodybuilders and athletes with such dependencies to steroids.
Good Luck!