Test cases and small typo fix