I also managed to fix my a640 in test mode shortly after posting in this thread, but I never posted the fix, although I meant to.
Test mode is where it's at. And the values you want to look at are:
0xx BATT TYPE:1 (Batt_IDV:001)
0xx BatteryValue
0xx BattVal__219
0xx BattVal__219
0xx...