Adds Guard along with some tests.