Partial fix to testSteps still needs overall testing