Update MoneyType, fix tests