Fixed several regression test errors.