Tests pass

Now testing with a complex guard