Slight cleanup of manual tests in main