Reduced the time needed for some of the tests (search #23 and history #9) by adding restrictions to the search.