I like the Aquarium Pharmaceuticals brand too. I think it's called the "Freshwater Master Test Kit". If you can't find it locally (Petco & Petsmart usually cary it) you may be able to get it at KoiVillage.com. The one I refer to is the one that tests pH, Nitrite, Ammonia, Carbonate hardness (KH) + General hardness (GH). It is under their "pond care" line of products.
One of their kits tests for salt, but not for KH and GH. Try to find the KH & GH one.
I've tired other kits (like the Tetra Laborett), but I always go back to that AQ kit.
The test strips are somewhat valuable, though, as they give a "quick" overall view that only takes a minute. If you get a strange reading, you can then test more thoroughly. It's nice to have both.