Fix test errors

Included commit for a conf param rename as well.