Clean up web.xml and create a unit test to keep it clean.

VIVO-19