SWC-715 Updated tests to cover submission cases