COmmentinf out test-case w.r.t changes for location-code commented out