Please add unit test for this new API. Thanks for your efforts!