Refactor BillGenerator to be Bill object
 - So that tests can actually get the values of the calculated bill