Refactor TestStep creation