Improvements, addition of test for exchange rate update