Fixed/modified tests to take sorting and skipping into account