fixing bug in forwarding, changed sw test