Added unit tests for feature