Adds test step dispatching for better error messages