Fixed typos, added more unit test