Added Guard and changes some test paths