Make `modern` build pass unit tests again.