not sure how long you have before your test as april 4 has already past maybe you meant may 4.
might test yourself to see if you pass when your date gets close but its not uncommon for it to take 60-70 days to clean up if you smoked daily for a long time.