Split test discovery and loading into different classes