Added unit test
Implemented missing unit test for feature