Mild refactor of DefectTrackerTests