#2668 - Adding Unit Tests for new function