Minor changes to ServletTest