update client test
client test tweak
fixed client test error on non mac
fixed infinite loop with bad input
Merge branch 'dev'