Clean up mix test options wrangling