Fix servlet definition model and added more testing