Move x forwarding to ls.test