Change configuration.
Added new unit test to improve code coverage.