Fix some unit tests in order to make them pass.