Added Guard to assist in autotesting

With the numerous additions I am working on, figured adding Guard would assist in the testing.
Why this change (and the renaming below)?