Test failure fixes