Improve test integration
Handle configuration