refactor test clients; refactor stomp integration test