Combined fail but charge bulk sub testing rebase

Merge of fail but charge work.