Accidentally committed test discovery changes.
Further work on switching to new csv format.