Fixes for: rollup when RUNNING or LAUNCHED, clearing and deleting test_steps