Fixing typos and test cases