Fixed unit tests to match code change.