Fixed unit tests to pass.