Fix test failures

introduced in ee1b86c428fb5237e5e3bbc008993afb5d689660.