IMPLEMENT Test skeleton
IMPLEMENT Client Object
Merge branch 'step2' into develop