Maybe the old shock and swim needs to "disappear" the next time he leaves the house for errands!

I would add bleach until you get dark yellow on the tester, then leave it til the morning and test again. The dilution method you're using gives a pretty good ballpark, but it won't hurt to put just a little extra in, for good measure.

Janet