Update tests to handle cases when there are results and when there are no results