Add more tests to 2.2.1 to close #42.