Changes for configuration testings