Re-tracking t17 and t18 files

For some reason, these fell off the radar.