TCMS: Remove need for specified directory, first pass