ported clients to servlets, optimized imports
Added junit static import
Slashed some cases, made it compile