This seems rather broach warning catching -- if it's too much work to isolate each individual test method that's affected, could we include a comment so we know why this is here and when to remove it?