changes to support SpringJUnit4ClassRunner/WebAppConfiguration integration tests
unit tests switched to junit because integration tests are also based on junit (SpringJUnit4ClassRunner)
integration tests based on SpringJUnit4ClassRunner/WebAppConfiguration