Fixes some test errors.