For #255 some test corrections based on CI failures.