New and improved test options