Minor change and basic unit test added