Fix issue #486, repair test cases on clang.