Fixed more test errors.