refactor tests to remove Step dependency