Test updates to make Jenkins happy