Introduce Configuration
Improve test passing state.