Upgrade and more stuff test payment module CJH