Added three more tests

Also fixed some issues with field 17 not validating.