Merge "Modify tests for another glibc difference."