Fix failing test InheritanceSpec that failed because BigDecimal was stored as Integer.
- only store Integer and Short instances as Integer