I have a individual cell charger for 18650 batteries that gives you a reading of internal resistance and capacity.
I then harvest dead laptop batteries for 18650s, usually only one or two cells is duff.
Then use one of the battery cases from deal extreme or eBay to assemble a pack of cells with the nearest matching capacities and internal resistance.
Be very careful especially harvesting cells, the cells contain a huge amount of energy and will give it up really quickly if short circuited and easily start fires.
Usually the cheap “new” 18650 cells on eBay or dx are recycled cells or really poor capacity. Better to harvest our own from quality branded laptop batteries.