Fixed unit tests for latest change.