Adding unittest and some config variable change