Added configuration and tests