Fixed a typo and tests