Configuration class updates, and test