Fix typo and update unit tests