Updated tests to not be as dependent as the number of results returned