restructuring and adding new payments tests