Test

Refine code. #1583

Job	Run time
cygwin64-cache	2m 54s
multiple-arch-armv7	5m 38s
utest-regression-blackbox-test	7m 1s
multiple-arch-aarch64	5m 32s
fast	1s
cygwin64	8m 1s
build-ubuntu20	1m 53s
build-centos7	2m 9s
build-cross-arm	2m 21s
build-ubuntu16	1m 27s
build-cross-aarch64	2m 22s
build-ubuntu18	1m 32s
coverage	2m 17s
multiple-arch-amd64	1m 19s
test-done	0s
	44m 27s

Provide feedback