Fixed minor formatting/test discovery issues