Improved test framework for the servlets tests.