Bugfix for new test step firing infrastructure