update config file
Added some unit tests