Improved the Servlet tests (no more loop and real json parsing instead
of eval function)