Adjust tests to use XmlWebApplicationContext as Annotation... doesn't pick up our Java config

https://www.pivotaltracker.com/story/show/82481136
[#82481136]