Adds test for 17
Adds test for 19