Zeqing Guo: complete unit test