Fixed typo
Added validation test and UTs for it