Fix gerrit string and teardown

Missing quote on gerrit string so regex wasn't
getting picked up.

Missing vars include in the teardown task.
Updates