More unit tests... better configurator