Cleanup numeric types.  Unit tests