Added test supporting client and testcase

see the docs