billing units revisited and updated with test method for common class