I thought I'd add that I'm now on day 17 of no smoking, and as of day 16, using dilution (sorta, honestly just drank three 16oz water bottles, as soon as piss was light color used a sample for testing) and I passed.

I'm still not passing with dark color urine though.