Bill generator now returns Bill object which makes more sense. Fixed unit tests.