Minor testing improvement