*8995* Make submission steps more general for test suite