Updatet servlet tests to follow the same *Test naming convention

Change-Id: I3c718232364f5ca7cce7131fa7685e4a2b833120