update Config class and tests