Make test options easier to deal with and output cleaner