Adding Client Tests, Fixing infinite CallBacks