Reorganized tests
Removed unused test class
Removed unused servlet
Updated client lib