Updated AdminServletTest to work with refactored code