Code clearance
Test client with manually registered handler