More attempts to pass unit tests (still fails).
[skip ci]