Just posting an update. Followed all recommendations suggested by GH and took it further. Removed from air intake,throttle body,valve cover to intake manifold. Replaced all the gaskets, some hoses that i broke, spark plugs,oxygen sensors,pcv and air filter. Did a lot of cleaning due to the amount of dirt built up on most of the parts involved particularly the throttle body,egr valve,idle control valve and the intake manifold. Put them all back together with no excess parts which was good. Anyway, what a difference. The car runs so much smoother and power. Hopefully, it would pass the retest this weekend. I will cross my finger until then.