Added test and Maxi savings calculator changes