Add Guard for automatic testing