Add test for #160
Add control
Fix #160
Add check for type=time too
Add reduced test case for #160
Filed as Apple bug #15122724