More corrections
Improve tests
Add trace for rate change. Improve printTable
Correct trace for rate change