Updated Code including new Smoke testcases....