Merge "Add Tests to InternalServletTest"