edited test branch by nanglin