added a test for i2199
some minor test case cleanup