Shawn/Issam/Ahmed-0104 Fixing search test