more test coverage, add check for keys.size() before checking ordering

more test coverage, add check for keys.size() before checking ordering #1265