Cleaned up servlet mount point.
Cleaned up return types and assertions.