Modify smoke test excecution