Fixed typo + Added tests