Upgrading of Methodology for Chlorine Testing in Water Sampling and Collection