(Issue #3851) remove optional parameter
(Issue #3851) add more following tests