Guard and smoke test now working