Added unit tests for the Configuration classes and minor cleanup

Change-Id: I0d3260f381eb212c793f9fdacb8c247ae32867e0