Fix typos and add some data to the test cases