changes to pass configuration tests