Improve test and use new gztest.