more test improvements
add finish client