Add tests and fixed bug where new 209 was failing

I incorrectly modified the logic on D209 in my previous PR and the tests did not catch it. So I added tests to cover both old and new 209 cases and fixed the problem.

I also added testing for D100 while at it.

Sorry for the miss...