Added fields to payment and bill class and tests

Also removed a field from payment class.
No longer using Tender class.