Added the InterestTracker, fixed some tests