Basic tests for search scope and order / search result layout + Fix for broken tests