Adapted tests to focus on content rather than on sort order