Fixed unit tests not passing.