Fixing Guard and tests.