Separate the context configuration file for different demonstrations.
Illustrate different scoped beans.
Small fixes.
Illustrate variety of approaches to achieve Dependency Injection.
Use static import for assertions.