Added configuration, passing tests