Updated junit to latest. Reorganized web.xml to proper order. Removed old test class