I want to rebuild a battery pack for my cordless. It holds 16 Sub C 1.2V Nicd batteries. I'd like recommendations for a brand of battery. Having read a few reviews I'd like to test each battery before I solder them into the pack. I want to avoid the work of removing a bad cell and the warranty tends to be voided after soldering. I want to be able to discharge, charge, and test capacity. Are there any American made Nicd batteries?