Small change in servlet, and fixed member matching test