Adapt unit tests to new logic.