[REF] start process of cleaning up payment activity handling

[REF] start process of cleaning up payment activity handling

At the moment activities are created when using the additional payment form but not the UI.
This needs cleaning up & this takes the first step by adding testing & slightly
simplifying where decisions are made about variables (assign title directly rather than component
just to assign title deeper down