Yes, the pump I purchased came as one unit pump, switch and accumulator already attached. I did swap the accumulator from the purchase pump unit with the accumulator already on the RR to try rule-out a bad accumulator. When that didn't solve the problem I put the accumulator back on the...