Fix bugs for GSoC test