Annotation-based config.
Fixing tests.