Fixed Build failure due to test errors.