Fixed Billions and Trillions conversion, added more test cases