AVAMONEY-57: Added tests