Allow the 'aux' and time zone options to be in any order. Because of this change, a simpler test case can achieve the same coverage.