added config, some unit tests