Improved search test