modified tests to rearchitect the client/adapter layer ... still needs work, not sure that the client is important anymore, switchboard might be the only client we need