testPlus

Switches SwrClientPlus to a test interface.