fix CelMailConfiguration and adding tests