Fix a unit test and bump version to 2.1.7