Make tests compilable
Merge pull request #1 from yfcai/wip-merge

Make tests compilable