Merge "Added junits to cover configuration classes"