Add tests for PR: #25