Added tests for czhang