Bug fixes and unit tests for implementation of in arrear/conusmable usage invoice.