17: Added unit tests for configuration, and did some refactoring in the ...

...process.