Update some more tests with spring contexts