Work on some unit tests for #7 and reorganize part of the config.