In the first instance I would do a 30% pwc
and treat with melafix according to the directions. Often clean water is enough to clear up some ailments, but a treatment like melafix helps this along.
Remember that a high bacterial or fungal presence in the water won't show up on the tests. So reducing the number of pathogens in the water is important too, hence pwcs.