Added additional Testing

Corrected rounding and conversion errors