More hunting down test issues