Add UnitTest for added feature