Update config class and tests