(1) Simplify client lib code

(2) Refactor test program