Added unit test
Redoing overly-callbacked client