Fix Whole and Decimal and their tests