adds Guard, fixes a test