[#56] fixed the search method according to comment and moving on to fixing the tests