Added configuration method and tests