Added test form for client API
Merged