Fixed a few test errors.