Fixing Build break due to af tests which are failing .