Added unit tests for the Configuration classes and minor cleanup