Fixed unit tests to match.