- add annotated classes and component scan
- update tests to use annotated version