Improved spring context, added a simple unit test on it