Increased Testing and Handling of Bug

* Handled a bug in the code where certain long-hand variants were coming
out as short-hand.
* Extended testing for negative numbers and zeros.