One more test improvement