Add missing beans to the test context
Fix integration tests
Add missing annotation